From beb8d362ffd0c9ddfd88e4cae02b3a02f1d12f95 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Thu, 21 Feb 2019 21:57:43 -0500 Subject: [PATCH] overlay: Remove gtk_overlay_set_overlay_pass_through gtk_overlay_set_overlay_pass_through has been made redundant by gtk_widget_set_can_pick. Remove it. --- docs/reference/gtk/gtk4-sections.txt | 2 - gtk/gtkoverlay.c | 77 ---------------------------- 2 files changed, 79 deletions(-) diff --git a/docs/reference/gtk/gtk4-sections.txt b/docs/reference/gtk/gtk4-sections.txt index 6a0cc0b852..7529fcab36 100644 --- a/docs/reference/gtk/gtk4-sections.txt +++ b/docs/reference/gtk/gtk4-sections.txt @@ -6249,8 +6249,6 @@ GtkOverlayClass gtk_overlay_new gtk_overlay_add_overlay -gtk_overlay_get_overlay_pass_through -gtk_overlay_set_overlay_pass_through gtk_overlay_get_measure_overlay gtk_overlay_set_measure_overlay gtk_overlay_get_clip_overlay diff --git a/gtk/gtkoverlay.c b/gtk/gtkoverlay.c index cf52534f97..4770c78057 100644 --- a/gtk/gtkoverlay.c +++ b/gtk/gtkoverlay.c @@ -64,7 +64,6 @@ typedef struct _GtkOverlayChild GtkOverlayChild; struct _GtkOverlayChild { - guint pass_through : 1; guint measure : 1; guint clip_overlay : 1; }; @@ -421,18 +420,6 @@ gtk_overlay_set_child_property (GtkContainer *container, switch (property_id) { - case CHILD_PROP_PASS_THROUGH: - /* Ignore value on main child */ - if (child_info) - { - if (g_value_get_boolean (value) != child_info->pass_through) - { - child_info->pass_through = g_value_get_boolean (value); - gtk_widget_set_pass_through (child, child_info->pass_through); - gtk_container_child_notify (container, child, "pass-through"); - } - } - break; case CHILD_PROP_MEASURE: if (child_info) { @@ -488,12 +475,6 @@ gtk_overlay_get_child_property (GtkContainer *container, switch (property_id) { - case CHILD_PROP_PASS_THROUGH: - if (child_info) - g_value_set_boolean (value, child_info->pass_through); - else - g_value_set_boolean (value, FALSE); - break; case CHILD_PROP_MEASURE: if (child_info) g_value_set_boolean (value, child_info->measure); @@ -570,16 +551,6 @@ gtk_overlay_class_init (GtkOverlayClass *klass) klass->get_child_position = gtk_overlay_get_child_position; - /** - * GtkOverlay:pass-through: - * - * Pass through input, does not affect main child. - */ - gtk_container_class_install_child_property (container_class, CHILD_PROP_PASS_THROUGH, - g_param_spec_boolean ("pass-through", P_("Pass Through"), P_("Pass through input, does not affect main child"), - FALSE, - GTK_PARAM_READWRITE)); - /** * GtkOverlay:measure: * @@ -726,54 +697,6 @@ gtk_overlay_add_overlay (GtkOverlay *overlay, gtk_overlay_set_overlay_child (widget, child); } -/** - * gtk_overlay_set_overlay_pass_through: - * @overlay: a #GtkOverlay - * @widget: an overlay child of #GtkOverlay - * @pass_through: whether the child should pass the input through - * - * Convenience function to set the value of the #GtkOverlay:pass-through - * child property for @widget. - */ -void -gtk_overlay_set_overlay_pass_through (GtkOverlay *overlay, - GtkWidget *widget, - gboolean pass_through) -{ - g_return_if_fail (GTK_IS_OVERLAY (overlay)); - g_return_if_fail (GTK_IS_WIDGET (widget)); - - gtk_container_child_set (GTK_CONTAINER (overlay), widget, - "pass-through", pass_through, - NULL); -} - -/** - * gtk_overlay_get_overlay_pass_through: - * @overlay: a #GtkOverlay - * @widget: an overlay child of #GtkOverlay - * - * Convenience function to get the value of the #GtkOverlay:pass-through - * child property for @widget. - * - * Returns: whether the widget is a pass through child. - */ -gboolean -gtk_overlay_get_overlay_pass_through (GtkOverlay *overlay, - GtkWidget *widget) -{ - gboolean pass_through; - - g_return_val_if_fail (GTK_IS_OVERLAY (overlay), FALSE); - g_return_val_if_fail (GTK_IS_WIDGET (widget), FALSE); - - gtk_container_child_get (GTK_CONTAINER (overlay), widget, - "pass-through", &pass_through, - NULL); - - return pass_through; -} - /** * gtk_overlay_set_measure_overlay: * @overlay: a #GtkOverlay -- 2.30.2